#include "gtkclipboard.h"
#include "gtkdnd.h"
#include "gtkentry.h"
+#include "gtkentrybuffer.h"
#include "gtkimagemenuitem.h"
#include "gtkimcontextsimple.h"
#include "gtkimmulticontext.h"
#define COMPLETION_TIMEOUT 300
#define PASSWORD_HINT_MAX 8
-/* Initial size of buffer, in bytes */
-#define MIN_SIZE 16
-
-/* Maximum size of text buffer, in bytes */
-#define MAX_SIZE G_MAXUSHORT
-
#define MAX_ICONS 2
#define IS_VALID_ICON_POSITION(pos) \
struct _GtkEntryPrivate
{
+ GtkEntryBuffer* buffer;
+
gfloat xalign;
gint insert_pos;
guint blink_time; /* time in msec the cursor has blinked since last user event */
struct _GtkEntryPasswordHint
{
- gchar password_hint[PASSWORD_HINT_MAX];
- guint password_hint_timeout_id;
- gint password_hint_length;
- gint password_hint_position;
+ gint position; /* Position (in text) of the last password hint */
+ guint source_id; /* Timeout source id */
};
typedef struct _GtkEntryCapslockFeedback GtkEntryCapslockFeedback;
enum {
PROP_0,
+ PROP_BUFFER,
PROP_CURSOR_POSITION,
PROP_SELECTION_BOUND,
PROP_EDITABLE,
CURSOR_DND
} CursorType;
+typedef enum
+{
+ DISPLAY_NORMAL, /* The entry text is being shown */
+ DISPLAY_INVISIBLE, /* In invisible mode, text replaced by (eg) bullets */
+ DISPLAY_BLANK /* In invisible mode, nothing shown at all */
+} DisplayMode;
+
/* GObject, GtkObject methods
*/
static void gtk_entry_editable_init (GtkEditableClass *iface);
static void gtk_entry_cell_editable_init (GtkCellEditableIface *iface);
+static GObject* gtk_entry_constructor (GType type,
+ guint n_props,
+ GObjectConstructParam *props);
static void gtk_entry_set_property (GObject *object,
guint prop_id,
const GValue *value,
static void gtk_entry_delete_whitespace (GtkEntry *entry);
static void gtk_entry_select_word (GtkEntry *entry);
static void gtk_entry_select_line (GtkEntry *entry);
-static char * gtk_entry_get_public_chars (GtkEntry *entry,
- gint start,
- gint end);
static void gtk_entry_paste (GtkEntry *entry,
GdkAtom selection);
static void gtk_entry_update_primary_selection (GtkEntry *entry);
static void emit_changed (GtkEntry *entry);
+static void buffer_inserted_text (GtkEntryBuffer *buffer,
+ guint position,
+ const gchar *chars,
+ guint n_chars,
+ GtkEntry *entry);
+static void buffer_deleted_text (GtkEntryBuffer *buffer,
+ guint position,
+ guint n_chars,
+ GtkEntry *entry);
+static void buffer_notify_text (GtkEntryBuffer *buffer,
+ GParamSpec *spec,
+ GtkEntry *entry);
+static void buffer_notify_length (GtkEntryBuffer *buffer,
+ GParamSpec *spec,
+ GtkEntry *entry);
+static void buffer_notify_max_length (GtkEntryBuffer *buffer,
+ GParamSpec *spec,
+ GtkEntry *entry);
+static void buffer_connect_signals (GtkEntry *entry);
+static void buffer_disconnect_signals (GtkEntry *entry);
+
G_DEFINE_TYPE_WITH_CODE (GtkEntry, gtk_entry, GTK_TYPE_WIDGET,
G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE,
gtk_entry_editable_init)
widget_class = (GtkWidgetClass*) class;
gtk_object_class = (GtkObjectClass *)class;
+ gobject_class->constructor = gtk_entry_constructor;
gobject_class->dispose = gtk_entry_dispose;
gobject_class->finalize = gtk_entry_finalize;
gobject_class->set_property = gtk_entry_set_property;
quark_cursor_hadjustment = g_quark_from_static_string ("gtk-hadjustment");
quark_capslock_feedback = g_quark_from_static_string ("gtk-entry-capslock-feedback");
+ g_object_class_install_property (gobject_class,
+ PROP_BUFFER,
+ g_param_spec_object ("buffer",
+ P_("Text Buffer"),
+ P_("Text buffer object which actually stores entry text"),
+ GTK_TYPE_ENTRY_BUFFER,
+ GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+
g_object_class_install_property (gobject_class,
PROP_CURSOR_POSITION,
g_param_spec_int ("cursor-position",
P_("Cursor Position"),
P_("The current position of the insertion cursor in chars"),
0,
- MAX_SIZE,
+ GTK_ENTRY_BUFFER_MAX_SIZE,
0,
GTK_PARAM_READABLE));
P_("Selection Bound"),
P_("The position of the opposite end of the selection from the cursor in chars"),
0,
- MAX_SIZE,
+ GTK_ENTRY_BUFFER_MAX_SIZE,
0,
GTK_PARAM_READABLE));
P_("Maximum length"),
P_("Maximum number of characters for this entry. Zero if no maximum"),
0,
- MAX_SIZE,
+ GTK_ENTRY_BUFFER_MAX_SIZE,
0,
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
switch (prop_id)
{
+ case PROP_BUFFER:
+ gtk_entry_set_buffer (entry, g_value_get_object (value));
+ break;
+
case PROP_EDITABLE:
{
gboolean new_value = g_value_get_boolean (value);
switch (prop_id)
{
+ case PROP_BUFFER:
+ g_value_set_object (value, gtk_entry_get_buffer (entry));
+ break;
+
case PROP_CURSOR_POSITION:
g_value_set_int (value, entry->current_pos);
break;
break;
case PROP_MAX_LENGTH:
- g_value_set_int (value, entry->text_max_length);
+ g_value_set_int (value, gtk_entry_buffer_get_max_length (priv->buffer));
break;
case PROP_VISIBILITY:
break;
case PROP_TEXT_LENGTH:
- g_value_set_uint (value, entry->text_length);
+ g_value_set_uint (value, gtk_entry_buffer_get_length (priv->buffer));
break;
case PROP_INVISIBLE_CHAR_SET:
return '*';
}
+static GObject*
+gtk_entry_constructor (GType type,
+ guint n_props,
+ GObjectConstructParam *props)
+{
+ GObject *obj = G_OBJECT_CLASS (gtk_entry_parent_class)->constructor (type, n_props, props);
+ GtkEntryPrivate *priv;
+ GtkEntryBuffer *buffer;
+
+ if (obj != NULL)
+ {
+ priv = GTK_ENTRY_GET_PRIVATE (obj);
+ if (!priv->buffer)
+ {
+ buffer = gtk_entry_buffer_new (NULL, 0);
+ gtk_entry_set_buffer (GTK_ENTRY (obj), buffer);
+ g_object_unref (buffer);
+ }
+ }
+
+ return obj;
+}
+
static void
gtk_entry_init (GtkEntry *entry)
{
GTK_WIDGET_SET_FLAGS (entry, GTK_CAN_FOCUS);
- entry->text_size = MIN_SIZE;
- entry->text = g_malloc (entry->text_size);
- entry->text[0] = '\0';
-
entry->editable = TRUE;
entry->visible = TRUE;
entry->invisible_char = find_invisible_char (GTK_WIDGET (entry));
priv->real_changed = TRUE;
}
-/*
- * Overwrite a memory that might contain sensitive information.
- */
-static void
-trash_area (gchar *area, gsize len)
-{
- volatile gchar *varea = (volatile gchar *)area;
- while (len-- > 0)
- *varea++ = 0;
-}
-
static void
gtk_entry_destroy (GtkObject *object)
{
GtkEntry *entry = GTK_ENTRY (object);
- entry->n_bytes = 0;
- entry->current_pos = entry->selection_bound = entry->text_length = 0;
+ entry->current_pos = entry->selection_bound = 0;
_gtk_entry_reset_im_context (entry);
gtk_entry_reset_layout (entry);
entry->recompute_idle = 0;
}
- if (!entry->visible)
- {
- /* We want to trash the text here because the entry might be leaked. */
- trash_area (entry->text, strlen (entry->text));
- }
-
GTK_OBJECT_CLASS (gtk_entry_parent_class)->destroy (object);
}
if (entry->recompute_idle)
g_source_remove (entry->recompute_idle);
- entry->text_size = 0;
+ g_free (priv->im_module);
+
+ /* COMPAT: entry->text is a deprecated field, and the allocation
+ is owned by the buffer. */
- if (entry->text)
+ gtk_entry_set_buffer (entry, NULL);
+
+ G_OBJECT_CLASS (gtk_entry_parent_class)->finalize (object);
+}
+
+static DisplayMode
+gtk_entry_get_display_mode (GtkEntry *entry)
+{
+ GtkEntryPrivate *priv;
+ if (entry->visible)
+ return DISPLAY_NORMAL;
+ priv = GTK_ENTRY_GET_PRIVATE (entry);
+ if (entry->invisible_char == 0 && priv->invisible_char_set)
+ return DISPLAY_BLANK;
+ return DISPLAY_INVISIBLE;
+}
+
+static gchar*
+gtk_entry_get_display_text (GtkEntry *entry,
+ gint start_pos,
+ gint end_pos)
+{
+ GtkEntryPasswordHint *password_hint;
+ GtkEntryPrivate *priv;
+ gunichar invisible_char;
+ const gchar *start;
+ const gchar *end;
+ const gchar *text;
+ gchar char_str[7];
+ gint char_len;
+ GString *str;
+ guint length;
+ gint i;
+
+ priv = GTK_ENTRY_GET_PRIVATE (entry);
+ text = gtk_entry_buffer_get_text (priv->buffer);
+ length = gtk_entry_buffer_get_length (priv->buffer);
+
+ if (end_pos < 0)
+ end_pos = length;
+ if (start_pos > length)
+ start_pos = length;
+
+ if (end_pos <= start_pos)
+ return g_strdup ("");
+ else if (entry->visible)
{
- if (!entry->visible)
- trash_area (entry->text, strlen (entry->text));
- g_free (entry->text);
- entry->text = NULL;
+ start = g_utf8_offset_to_pointer (text, start_pos);
+ end = g_utf8_offset_to_pointer (start, end_pos - start_pos);
+ return g_strndup (start, end - start);
}
+ else
+ {
+ str = g_string_sized_new (length * 2);
- g_free (priv->im_module);
+ /* Figure out what our invisible char is and encode it */
+ if (!entry->invisible_char)
+ invisible_char = priv->invisible_char_set ? ' ' : '*';
+ else
+ invisible_char = entry->invisible_char;
+ char_len = g_unichar_to_utf8 (invisible_char, char_str);
+
+ /*
+ * Add hidden characters for each character in the text
+ * buffer. If there is a password hint, then keep that
+ * character visible.
+ */
+
+ password_hint = g_object_get_qdata (G_OBJECT (entry), quark_password_hint);
+ for (i = start_pos; i < end_pos; ++i)
+ {
+ if (password_hint && i == password_hint->position)
+ {
+ start = g_utf8_offset_to_pointer (text, i);
+ g_string_append_len (str, start, g_utf8_next_char (start) - start);
+ }
+ else
+ {
+ g_string_append_len (str, char_str, char_len);
+ }
+ }
+
+ return g_string_free (str, FALSE);
+ }
- G_OBJECT_CLASS (gtk_entry_parent_class)->finalize (object);
}
static void
gtk_entry_draw_text (GTK_ENTRY (widget));
- if ((entry->visible || entry->invisible_char != 0) &&
+ /* When no text is being displayed at all, don't show the cursor */
+ if (gtk_entry_get_display_mode (entry) != DISPLAY_BLANK &&
GTK_WIDGET_HAS_FOCUS (widget) &&
- entry->selection_bound == entry->current_pos && entry->cursor_visible)
- gtk_entry_draw_cursor (GTK_ENTRY (widget), CURSOR_STANDARD);
+ entry->selection_bound == entry->current_pos && entry->cursor_visible)
+ gtk_entry_draw_cursor (GTK_ENTRY (widget), CURSOR_STANDARD);
}
else
{
if (entry->in_drag)
{
- if (entry->visible &&
+ if (gtk_entry_get_display_mode (entry) == DISPLAY_NORMAL &&
gtk_drag_check_threshold (widget,
entry->drag_start_x, entry->drag_start_y,
event->x + entry->scroll_offset, event->y))
if (event->y < 0)
tmp_pos = 0;
else if (event->y >= height)
- tmp_pos = entry->text_length;
+ tmp_pos = gtk_entry_buffer_get_length (priv->buffer);
else
tmp_pos = gtk_entry_find_position (entry, event->x + entry->scroll_offset);
gint new_text_length,
gint *position)
{
- GtkEntry *entry = GTK_ENTRY (editable);
- gchar buf[64];
- gchar *text;
-
- if (*position < 0 || *position > entry->text_length)
- *position = entry->text_length;
-
g_object_ref (editable);
-
- if (new_text_length <= 63)
- text = buf;
- else
- text = g_new (gchar, new_text_length + 1);
- text[new_text_length] = '\0';
- strncpy (text, new_text, new_text_length);
-
- g_signal_emit_by_name (editable, "insert-text", text, new_text_length, position);
-
- if (!entry->visible)
- trash_area (text, new_text_length);
+ /*
+ * The incoming text may a password or other secret. We make sure
+ * not to copy it into temporary buffers.
+ */
- if (new_text_length > 63)
- g_free (text);
+ g_signal_emit_by_name (editable, "insert-text", new_text, new_text_length, position);
g_object_unref (editable);
}
gint start_pos,
gint end_pos)
{
- GtkEntry *entry = GTK_ENTRY (editable);
-
- if (end_pos < 0 || end_pos > entry->text_length)
- end_pos = entry->text_length;
- if (start_pos < 0)
- start_pos = 0;
- if (start_pos > end_pos)
- start_pos = end_pos;
-
g_object_ref (editable);
g_signal_emit_by_name (editable, "delete-text", start_pos, end_pos);
gint start_pos,
gint end_pos)
{
- GtkEntry *entry = GTK_ENTRY (editable);
- gint start_index, end_index;
-
- if (end_pos < 0)
- end_pos = entry->text_length;
-
- start_pos = MIN (entry->text_length, start_pos);
- end_pos = MIN (entry->text_length, end_pos);
-
- start_index = g_utf8_offset_to_pointer (entry->text, start_pos) - entry->text;
- end_index = g_utf8_offset_to_pointer (entry->text, end_pos) - entry->text;
-
- return g_strndup (entry->text + start_index, end_index - start_index);
+ return gtk_entry_get_display_text (GTK_ENTRY (editable), start_pos, end_pos);
}
static void
gint position)
{
GtkEntry *entry = GTK_ENTRY (editable);
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
+
+ guint length;
- if (position < 0 || position > entry->text_length)
- position = entry->text_length;
+ length = gtk_entry_buffer_get_length (priv->buffer);
+ if (position < 0 || position > length)
+ position = length;
if (position != entry->current_pos ||
position != entry->selection_bound)
gint end)
{
GtkEntry *entry = GTK_ENTRY (editable);
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
+ guint length;
+ length = gtk_entry_buffer_get_length (priv->buffer);
if (start < 0)
- start = entry->text_length;
+ start = length;
if (end < 0)
- end = entry->text_length;
+ end = length;
_gtk_entry_reset_im_context (entry);
gtk_entry_set_positions (entry,
- MIN (end, entry->text_length),
- MIN (start, entry->text_length));
+ MIN (end, length),
+ MIN (start, length));
gtk_entry_update_primary_selection (entry);
}
static void
gtk_entry_password_hint_free (GtkEntryPasswordHint *password_hint)
{
- if (password_hint->password_hint_timeout_id)
- g_source_remove (password_hint->password_hint_timeout_id);
+ if (password_hint->source_id)
+ g_source_remove (password_hint->source_id);
g_slice_free (GtkEntryPasswordHint, password_hint);
}
+
+static gboolean
+gtk_entry_remove_password_hint (gpointer data)
+{
+ GtkEntryPasswordHint *password_hint = g_object_get_qdata (data, quark_password_hint);
+ password_hint->position = -1;
+
+ /* Force the string to be redrawn, but now without a visible character */
+ gtk_entry_recompute (GTK_ENTRY (data));
+ return FALSE;
+}
+
/* Default signal handlers
*/
static void
gint new_text_length,
gint *position)
{
- GtkEntry *entry = GTK_ENTRY (editable);
- gint index;
+ guint n_inserted;
gint n_chars;
- if (new_text_length < 0)
- new_text_length = strlen (new_text);
-
n_chars = g_utf8_strlen (new_text, new_text_length);
- if (entry->text_max_length > 0 && n_chars + entry->text_length > entry->text_max_length)
- {
- gtk_widget_error_bell (GTK_WIDGET (entry));
- n_chars = entry->text_max_length - entry->text_length;
- new_text_length = g_utf8_offset_to_pointer (new_text, n_chars) - new_text;
- }
- if (new_text_length + entry->n_bytes + 1 > entry->text_size)
- {
- gsize prev_size = entry->text_size;
+ /*
+ * The actual insertion into the buffer. This will end up firing the
+ * following signal handlers: buffer_inserted_text(), buffer_notify_display_text(),
+ * buffer_notify_text(), buffer_notify_length()
+ */
+ n_inserted = gtk_entry_buffer_insert_text (GTK_ENTRY_GET_PRIVATE (editable)->buffer, *position, new_text, n_chars);
- while (new_text_length + entry->n_bytes + 1 > entry->text_size)
- {
- if (entry->text_size == 0)
- entry->text_size = MIN_SIZE;
- else
- {
- if (2 * (guint)entry->text_size < MAX_SIZE &&
- 2 * (guint)entry->text_size > entry->text_size)
- entry->text_size *= 2;
- else
- {
- entry->text_size = MAX_SIZE;
- if (new_text_length > (gint)entry->text_size - (gint)entry->n_bytes - 1)
- {
- new_text_length = (gint)entry->text_size - (gint)entry->n_bytes - 1;
- new_text_length = g_utf8_find_prev_char (new_text, new_text + new_text_length + 1) - new_text;
- n_chars = g_utf8_strlen (new_text, new_text_length);
- }
- break;
- }
- }
- }
+ if (n_inserted != n_chars)
+ gtk_widget_error_bell (GTK_WIDGET (editable));
- if (entry->visible)
- entry->text = g_realloc (entry->text, entry->text_size);
- else
- {
- /* Same thing, just slower and without leaving stuff in memory. */
- gchar *et_new = g_malloc (entry->text_size);
- memcpy (et_new, entry->text, MIN (prev_size, entry->text_size));
- trash_area (entry->text, prev_size);
- g_free (entry->text);
- entry->text = et_new;
- }
- }
+ *position += n_inserted;
+}
- index = g_utf8_offset_to_pointer (entry->text, *position) - entry->text;
+static void
+gtk_entry_real_delete_text (GtkEditable *editable,
+ gint start_pos,
+ gint end_pos)
+{
+ /*
+ * The actual deletion from the buffer. This will end up firing the
+ * following signal handlers: buffer_deleted_text(), buffer_notify_display_text(),
+ * buffer_notify_text(), buffer_notify_length()
+ */
- g_memmove (entry->text + index + new_text_length, entry->text + index, entry->n_bytes - index);
- memcpy (entry->text + index, new_text, new_text_length);
+ gtk_entry_buffer_delete_text (GTK_ENTRY_GET_PRIVATE (editable)->buffer, start_pos, end_pos - start_pos);
+}
- entry->n_bytes += new_text_length;
- entry->text_length += n_chars;
+/* GtkEntryBuffer signal handlers
+ */
+static void
+buffer_inserted_text (GtkEntryBuffer *buffer,
+ guint position,
+ const gchar *chars,
+ guint n_chars,
+ GtkEntry *entry)
+{
+ guint password_hint_timeout;
- /* NUL terminate for safety and convenience */
- entry->text[entry->n_bytes] = '\0';
-
- if (entry->current_pos > *position)
+ if (entry->current_pos > position)
entry->current_pos += n_chars;
-
- if (entry->selection_bound > *position)
+
+ if (entry->selection_bound > position)
entry->selection_bound += n_chars;
- if (n_chars == 1 && !entry->visible && (new_text_length < PASSWORD_HINT_MAX))
+ /* Calculate the password hint if it needs to be displayed. */
+ if (n_chars == 1 && !entry->visible)
{
- guint password_hint_timeout;
-
g_object_get (gtk_widget_get_settings (GTK_WIDGET (entry)),
"gtk-entry-password-hint-timeout", &password_hint_timeout,
NULL);
{
GtkEntryPasswordHint *password_hint = g_object_get_qdata (G_OBJECT (entry),
quark_password_hint);
-
if (!password_hint)
{
password_hint = g_slice_new0 (GtkEntryPasswordHint);
- g_object_set_qdata_full (G_OBJECT (entry), quark_password_hint,
- password_hint,
- (GDestroyNotify) gtk_entry_password_hint_free);
+ g_object_set_qdata_full (G_OBJECT (entry), quark_password_hint, password_hint,
+ (GDestroyNotify)gtk_entry_password_hint_free);
}
- memset (&password_hint->password_hint, 0x0, PASSWORD_HINT_MAX);
- password_hint->password_hint_length = new_text_length;
- memcpy (&password_hint->password_hint, new_text, new_text_length);
- password_hint->password_hint_position = *position + n_chars;
- }
+ password_hint->position = position;
+ if (password_hint->source_id)
+ g_source_remove (password_hint->source_id);
+ password_hint->source_id = gdk_threads_add_timeout (password_hint_timeout,
+ (GSourceFunc)gtk_entry_remove_password_hint, entry);
+ }
}
- else
+}
+
+static void
+buffer_deleted_text (GtkEntryBuffer *buffer,
+ guint position,
+ guint n_chars,
+ GtkEntry *entry)
+{
+ guint end_pos = position + n_chars;
+ gint selection_bound;
+ guint current_pos;
+
+ current_pos = entry->current_pos;
+ if (current_pos > position)
+ current_pos -= MIN (current_pos, end_pos) - position;
+
+ selection_bound = entry->selection_bound;
+ if (selection_bound > position)
+ selection_bound -= MIN (selection_bound, end_pos) - position;
+
+ gtk_entry_set_positions (entry, current_pos, selection_bound);
+
+ /* We might have deleted the selection */
+ gtk_entry_update_primary_selection (entry);
+
+ /* Disable the password hint if one exists. */
+ if (!entry->visible)
{
- g_object_set_qdata (G_OBJECT (entry), quark_password_hint, NULL);
+ GtkEntryPasswordHint *password_hint = g_object_get_qdata (G_OBJECT (entry),
+ quark_password_hint);
+ if (password_hint)
+ {
+ if (password_hint->source_id)
+ g_source_remove (password_hint->source_id);
+ password_hint->source_id = 0;
+ password_hint->position = -1;
+ }
}
+}
- *position += n_chars;
+static void
+buffer_notify_text (GtkEntryBuffer *buffer,
+ GParamSpec *spec,
+ GtkEntry *entry)
+{
+ /* COMPAT: Deprecated, not used. This struct field will be removed in GTK+ 3.x */
+ entry->text = (gchar*)gtk_entry_buffer_get_text (buffer);
gtk_entry_recompute (entry);
-
emit_changed (entry);
- g_object_notify (G_OBJECT (editable), "text");
- g_object_notify (G_OBJECT (editable), "text-length");
+ g_object_notify (G_OBJECT (entry), "text");
}
static void
-gtk_entry_real_delete_text (GtkEditable *editable,
- gint start_pos,
- gint end_pos)
+buffer_notify_length (GtkEntryBuffer *buffer,
+ GParamSpec *spec,
+ GtkEntry *entry)
{
- GtkEntry *entry = GTK_ENTRY (editable);
-
- if (start_pos < 0)
- start_pos = 0;
- if (end_pos < 0 || end_pos > entry->text_length)
- end_pos = entry->text_length;
-
- if (start_pos < end_pos)
- {
- gint start_index = g_utf8_offset_to_pointer (entry->text, start_pos) - entry->text;
- gint end_index = g_utf8_offset_to_pointer (entry->text, end_pos) - entry->text;
- gint current_pos;
- gint selection_bound;
-
- g_memmove (entry->text + start_index, entry->text + end_index, entry->n_bytes + 1 - end_index);
- entry->text_length -= (end_pos - start_pos);
- entry->n_bytes -= (end_index - start_index);
+ /* COMPAT: Deprecated, not used. This struct field will be removed in GTK+ 3.x */
+ entry->text_length = gtk_entry_buffer_get_length (buffer);
- /* In password-mode, make sure we don't leave anything sensitive after
- * the terminating zero. Note, that the terminating zero already trashed
- * one byte.
- */
- if (!entry->visible)
- trash_area (entry->text + entry->n_bytes + 1, end_index - start_index - 1);
-
- current_pos = entry->current_pos;
- if (current_pos > start_pos)
- current_pos -= MIN (current_pos, end_pos) - start_pos;
+ g_object_notify (G_OBJECT (entry), "text-length");
+}
- selection_bound = entry->selection_bound;
- if (selection_bound > start_pos)
- selection_bound -= MIN (selection_bound, end_pos) - start_pos;
+static void
+buffer_notify_max_length (GtkEntryBuffer *buffer,
+ GParamSpec *spec,
+ GtkEntry *entry)
+{
+ /* COMPAT: Deprecated, not used. This struct field will be removed in GTK+ 3.x */
+ entry->text_max_length = gtk_entry_buffer_get_max_length (buffer);
- gtk_entry_set_positions (entry, current_pos, selection_bound);
+ g_object_notify (G_OBJECT (entry), "max-length");
+}
- /* We might have deleted the selection
- */
- gtk_entry_update_primary_selection (entry);
-
- gtk_entry_recompute (entry);
+static void
+buffer_connect_signals (GtkEntry *entry)
+{
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
+ g_signal_connect (priv->buffer, "inserted-text", G_CALLBACK (buffer_inserted_text), entry);
+ g_signal_connect (priv->buffer, "deleted-text", G_CALLBACK (buffer_deleted_text), entry);
+ g_signal_connect (priv->buffer, "notify::text", G_CALLBACK (buffer_notify_text), entry);
+ g_signal_connect (priv->buffer, "notify::length", G_CALLBACK (buffer_notify_length), entry);
+ g_signal_connect (priv->buffer, "notify::max-length", G_CALLBACK (buffer_notify_max_length), entry);
+}
- emit_changed (entry);
- g_object_notify (G_OBJECT (editable), "text");
- g_object_notify (G_OBJECT (editable), "text-length");
- }
+static void
+buffer_disconnect_signals (GtkEntry *entry)
+{
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
+ g_signal_handlers_disconnect_by_func (priv->buffer, buffer_inserted_text, entry);
+ g_signal_handlers_disconnect_by_func (priv->buffer, buffer_deleted_text, entry);
+ g_signal_handlers_disconnect_by_func (priv->buffer, buffer_notify_text, entry);
+ g_signal_handlers_disconnect_by_func (priv->buffer, buffer_notify_length, entry);
+ g_signal_handlers_disconnect_by_func (priv->buffer, buffer_notify_max_length, entry);
}
/* Compute the X position for an offset that corresponds to the "more important
gboolean extend_selection)
{
gint new_pos = entry->current_pos;
+ GtkEntryPrivate *priv;
_gtk_entry_reset_im_context (entry);
case GTK_MOVEMENT_DISPLAY_LINE_ENDS:
case GTK_MOVEMENT_PARAGRAPH_ENDS:
case GTK_MOVEMENT_BUFFER_ENDS:
- new_pos = count < 0 ? 0 : entry->text_length;
+ priv = GTK_ENTRY_GET_PRIVATE (entry);
+ new_pos = count < 0 ? 0 : gtk_entry_buffer_get_length (priv->buffer);
break;
case GTK_MOVEMENT_DISPLAY_LINES:
case GTK_MOVEMENT_PARAGRAPHS:
case GTK_MOVEMENT_DISPLAY_LINE_ENDS:
case GTK_MOVEMENT_PARAGRAPH_ENDS:
case GTK_MOVEMENT_BUFFER_ENDS:
- new_pos = count < 0 ? 0 : entry->text_length;
+ priv = GTK_ENTRY_GET_PRIVATE (entry);
+ new_pos = count < 0 ? 0 : gtk_entry_buffer_get_length (priv->buffer);
if (entry->current_pos == new_pos)
gtk_widget_error_bell (GTK_WIDGET (entry));
break;
gint count)
{
GtkEditable *editable = GTK_EDITABLE (entry);
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
gint start_pos = entry->current_pos;
gint end_pos = entry->current_pos;
- gint old_n_bytes = entry->n_bytes;
+ gint old_n_bytes = gtk_entry_buffer_get_bytes (priv->buffer);
_gtk_entry_reset_im_context (entry);
break;
}
- if (entry->n_bytes == old_n_bytes)
+ if (gtk_entry_buffer_get_bytes (priv->buffer) == old_n_bytes)
gtk_widget_error_bell (GTK_WIDGET (entry));
gtk_entry_pend_cursor_blink (entry);
_gtk_entry_reset_im_context (entry);
- if (!entry->editable || !entry->text)
+ if (!entry->editable)
{
gtk_widget_error_bell (GTK_WIDGET (entry));
return;
pango_layout_get_log_attrs (layout, &log_attrs, &n_attrs);
- if (entry->visible &&
- log_attrs[entry->current_pos].backspace_deletes_character)
+ /* Deleting parts of characters */
+ if (log_attrs[entry->current_pos].backspace_deletes_character)
{
gchar *cluster_text;
gchar *normalized_text;
glong len;
- cluster_text = gtk_editable_get_chars (editable,
- prev_pos,
- entry->current_pos);
+ cluster_text = gtk_entry_get_display_text (entry, prev_pos,
+ entry->current_pos);
normalized_text = g_utf8_normalize (cluster_text,
strlen (cluster_text),
G_NORMALIZE_NFD);
return;
}
- str = gtk_entry_get_public_chars (entry, start, end);
+ str = gtk_entry_get_display_text (entry, start, end);
gtk_clipboard_set_text (gtk_widget_get_clipboard (GTK_WIDGET (entry),
GDK_SELECTION_CLIPBOARD),
str, -1);
gtk_entry_retrieve_surrounding_cb (GtkIMContext *context,
GtkEntry *entry)
{
- gtk_im_context_set_surrounding (context,
- entry->text,
- entry->n_bytes,
- g_utf8_offset_to_pointer (entry->text, entry->current_pos) - entry->text);
+ gchar *text;
+
+ /* XXXX ??? does this even make sense when text is not visible? Should we return FALSE? */
+ text = gtk_entry_get_display_text (entry, 0, -1);
+ gtk_im_context_set_surrounding (context, text, strlen (text), /* Length in bytes */
+ g_utf8_offset_to_pointer (text, entry->current_pos) - text);
+ g_free (text);
return TRUE;
}
}
}
-static void
-append_char (GString *str,
- gunichar ch,
- gint count)
-{
- gint i;
- gint char_len;
- gchar buf[7];
-
- char_len = g_unichar_to_utf8 (ch, buf);
-
- i = 0;
- while (i < count)
- {
- g_string_append_len (str, buf, char_len);
- ++i;
- }
-}
-
-static gboolean
-gtk_entry_remove_password_hint (gpointer data)
-{
- /* Force the string to be redrawn, but now without a visible character */
- gtk_entry_recompute (GTK_ENTRY (data));
-
- return FALSE;
-}
-
static PangoLayout *
gtk_entry_create_layout (GtkEntry *entry,
gboolean include_preedit)
GtkWidget *widget = GTK_WIDGET (entry);
PangoLayout *layout = gtk_widget_create_pango_layout (widget, NULL);
PangoAttrList *tmp_attrs = pango_attr_list_new ();
-
+
gchar *preedit_string = NULL;
gint preedit_length = 0;
PangoAttrList *preedit_attrs = NULL;
+ gchar *display;
+ guint n_bytes;
+
pango_layout_set_single_paragraph_mode (layout, TRUE);
+ display = gtk_entry_get_display_text (entry, 0, -1);
+ n_bytes = strlen (display);
+
if (include_preedit)
{
gtk_im_context_get_preedit_string (entry->im_context,
if (preedit_length)
{
- GString *tmp_string = g_string_new (NULL);
+ GString *tmp_string = g_string_new (display);
+ gint cursor_index = g_utf8_offset_to_pointer (display, entry->current_pos) - display;
- gint cursor_index = g_utf8_offset_to_pointer (entry->text, entry->current_pos) - entry->text;
-
- if (entry->visible)
- {
- g_string_prepend_len (tmp_string, entry->text, entry->n_bytes);
- g_string_insert (tmp_string, cursor_index, preedit_string);
- }
- else
- {
- gint ch_len;
- gunichar invisible_char;
-
- if (entry->invisible_char != 0)
- invisible_char = entry->invisible_char;
- else
- invisible_char = ' '; /* just pick a char */
-
- ch_len = g_utf8_strlen (entry->text, entry->n_bytes);
- append_char (tmp_string, invisible_char, ch_len);
- cursor_index =
- g_utf8_offset_to_pointer (tmp_string->str, entry->current_pos) -
- tmp_string->str;
- g_string_insert (tmp_string, cursor_index, preedit_string);
- }
+ g_string_insert (tmp_string, cursor_index, preedit_string);
pango_layout_set_text (layout, tmp_string->str, tmp_string->len);
{
PangoDirection pango_dir;
- if (entry->visible)
- pango_dir = pango_find_base_dir (entry->text, entry->n_bytes);
-
+ if (gtk_entry_get_display_mode (entry) == DISPLAY_NORMAL)
+ pango_dir = pango_find_base_dir (display, n_bytes);
else
pango_dir = PANGO_DIRECTION_NEUTRAL;
pango_dir);
entry->resolved_dir = pango_dir;
-
- if (entry->visible)
- {
- pango_layout_set_text (layout, entry->text, entry->n_bytes);
- }
- else
- {
- GString *str = g_string_new (NULL);
- gunichar invisible_char;
- guint password_hint_timeout;
- GtkEntryPasswordHint *password_hint;
-
- g_object_get (gtk_widget_get_settings (widget),
- "gtk-entry-password-hint-timeout", &password_hint_timeout,
- NULL);
-
- if (entry->invisible_char != 0)
- invisible_char = entry->invisible_char;
- else
- invisible_char = ' '; /* just pick a char */
-
- password_hint = g_object_get_qdata (G_OBJECT (entry),
- quark_password_hint);
- if (password_hint && password_hint->password_hint_timeout_id)
- {
- g_source_remove (password_hint->password_hint_timeout_id);
- password_hint->password_hint_timeout_id = 0;
- }
-
- if (password_hint_timeout == 0 || password_hint == NULL ||
- (password_hint && password_hint->password_hint_length == 0))
- {
- append_char (str, invisible_char, entry->text_length);
- }
- else if (password_hint)
- {
- /* Draw hidden characters upto the inserted position,
- * then the real thing, pad up to full length
- */
- if (password_hint->password_hint_position > 1)
- append_char (str, invisible_char,
- password_hint->password_hint_position - 1);
-
- g_string_append_len (str, password_hint->password_hint,
- password_hint->password_hint_length);
-
- if (password_hint->password_hint_position < entry->text_length)
- append_char (str, invisible_char,
- entry->text_length -
- password_hint->password_hint_position);
-
- /* Now remove this last input character, don't need
- * it anymore
- */
- memset (password_hint->password_hint, 0, PASSWORD_HINT_MAX);
- password_hint->password_hint_length = 0;
-
- password_hint->password_hint_timeout_id =
- gdk_threads_add_timeout (password_hint_timeout,
- (GSourceFunc) gtk_entry_remove_password_hint,
- entry);
- }
-
- pango_layout_set_text (layout, str->str, str->len);
- g_string_free (str, TRUE);
- }
+ pango_layout_set_text (layout, display, n_bytes);
}
pango_layout_set_attributes (layout, tmp_attrs);
g_free (preedit_string);
+ g_free (display);
+
if (preedit_attrs)
pango_attr_list_unref (preedit_attrs);
GtkWidget *widget = GTK_WIDGET (entry);
cairo_t *cr;
- if (!entry->visible && entry->invisible_char == 0)
+ /* Nothing to display at all */
+ if (gtk_entry_get_display_mode (entry) == DISPLAY_BLANK)
return;
if (GTK_WIDGET_DRAWABLE (entry))
gint *strong_x,
gint *weak_x)
{
- if (!entry->visible && !entry->invisible_char)
+ DisplayMode mode = gtk_entry_get_display_mode (entry);
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
+
+ /* Nothing to display at all, so no cursor is relevant */
+ if (mode == DISPLAY_BLANK)
{
if (strong_x)
*strong_x = 0;
if (entry->dnd_position > entry->current_pos)
{
- if (entry->visible)
+ if (mode == DISPLAY_NORMAL)
index += entry->preedit_length;
else
{
- gint preedit_len_chars = g_utf8_strlen (text, -1) - entry->text_length;
+ gint preedit_len_chars = g_utf8_strlen (text, -1) - gtk_entry_buffer_get_length (priv->buffer);
index += preedit_len_chars * g_unichar_to_utf8 (entry->invisible_char, NULL);
}
}
gint start,
gint count)
{
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
gint new_pos = start;
+ guint length;
+
+ length = gtk_entry_buffer_get_length (priv->buffer);
/* Prevent any leak of information */
- if (!entry->visible)
+ if (gtk_entry_get_display_mode (entry) != DISPLAY_NORMAL)
{
- new_pos = CLAMP (start + count, 0, entry->text_length);
+ new_pos = CLAMP (start + count, 0, length);
}
- else if (entry->text)
+ else
{
PangoLayout *layout = gtk_entry_ensure_layout (entry, FALSE);
PangoLogAttr *log_attrs;
pango_layout_get_log_attrs (layout, &log_attrs, &n_attrs);
- while (count > 0 && new_pos < entry->text_length)
+ while (count > 0 && new_pos < length)
{
do
new_pos++;
- while (new_pos < entry->text_length && !log_attrs[new_pos].is_cursor_position);
+ while (new_pos < length && !log_attrs[new_pos].is_cursor_position);
count--;
}
gint start,
gboolean allow_whitespace)
{
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
gint new_pos = start;
+ guint length;
+
+ length = gtk_entry_buffer_get_length (priv->buffer);
/* Prevent any leak of information */
- if (!entry->visible)
+ if (gtk_entry_get_display_mode (entry) != DISPLAY_NORMAL)
{
- new_pos = entry->text_length;
+ new_pos = length;
}
- else if (entry->text && (new_pos < entry->text_length))
+ else if (new_pos < length)
{
PangoLayout *layout = gtk_entry_ensure_layout (entry, FALSE);
PangoLogAttr *log_attrs;
gint new_pos = start;
/* Prevent any leak of information */
- if (!entry->visible)
+ if (gtk_entry_get_display_mode (entry) != DISPLAY_NORMAL)
{
new_pos = 0;
}
- else if (entry->text && start > 0)
+ else if (start > 0)
{
PangoLayout *layout = gtk_entry_ensure_layout (entry, FALSE);
PangoLogAttr *log_attrs;
gtk_editable_select_region (GTK_EDITABLE (entry), 0, -1);
}
-/*
- * Like gtk_editable_get_chars, but handle not-visible entries
- * correctly.
- */
-static char *
-gtk_entry_get_public_chars (GtkEntry *entry,
- gint start,
- gint end)
-{
- if (end < 0)
- end = entry->text_length;
-
- if (entry->visible)
- return gtk_editable_get_chars (GTK_EDITABLE (entry), start, end);
- else if (!entry->invisible_char)
- return g_strdup ("");
- else
- {
- GString *str = g_string_new (NULL);
- append_char (str, entry->invisible_char, end - start);
- return g_string_free (str, FALSE);
- }
-}
-
static gint
truncate_multiline (const gchar *text)
{
length = truncate_multiline (text);
/* only complete if the selection is at the end */
- popup_completion = (entry->text_length == MAX (entry->current_pos, entry->selection_bound));
+ popup_completion = (gtk_entry_buffer_get_length (priv->buffer) ==
+ MAX (entry->current_pos, entry->selection_bound));
if (completion)
{
if (gtk_editable_get_selection_bounds (GTK_EDITABLE (entry), &start, &end))
{
- gchar *str = gtk_entry_get_public_chars (entry, start, end);
+ gchar *str = gtk_entry_get_display_text (entry, start, end);
gtk_selection_data_set_text (selection_data, str, -1);
g_free (str);
}
return g_object_new (GTK_TYPE_ENTRY, NULL);
}
+/**
+ * gtk_entry_new_with_buffer:
+ * @buffer: The buffer to use for the new #GtkEntry.
+ *
+ * Creates a new entry with the specified text buffer.
+ *
+ * Return value: a new #GtkEntry
+ *
+ * Since: 2.18
+ */
+GtkWidget*
+gtk_entry_new_with_buffer (GtkEntryBuffer *buffer)
+{
+ g_return_val_if_fail (GTK_IS_ENTRY_BUFFER (buffer), NULL);
+ return g_object_new (GTK_TYPE_ENTRY, "buffer", buffer, NULL);
+}
+
/**
* gtk_entry_new_with_max_length:
* @max: the maximum length of the entry, or 0 for no maximum.
{
GtkEntry *entry;
- max = CLAMP (max, 0, MAX_SIZE);
+ max = CLAMP (max, 0, GTK_ENTRY_BUFFER_MAX_SIZE);
entry = g_object_new (GTK_TYPE_ENTRY, NULL);
- entry->text_max_length = max;
+ gtk_entry_buffer_set_max_length (GTK_ENTRY_GET_PRIVATE (entry)->buffer, max);
return GTK_WIDGET (entry);
}
+/**
+ * gtk_entry_get_buffer:
+ * @entry: a #GtkEntry
+ *
+ * Get the #GtkEntryBuffer object which holds the text for
+ * this widget.
+ *
+ * Since: 2.18
+ *
+ * Returns: A #GtkEntryBuffer object.
+ */
+GtkEntryBuffer*
+gtk_entry_get_buffer (GtkEntry *entry)
+{
+ g_return_val_if_fail (GTK_IS_ENTRY (entry), NULL);
+ return GTK_ENTRY_GET_PRIVATE (entry)->buffer;
+}
+
+/**
+ * gtk_entry_set_buffer:
+ * @entry: a #GtkEntry
+ * @buffer: a #GtkEntryBuffer
+ *
+ * Set the #GtkEntryBuffer object which holds the text for
+ * this widget.
+ *
+ * Since: 2.18
+ */
+void
+gtk_entry_set_buffer (GtkEntry *entry,
+ GtkEntryBuffer *buffer)
+{
+ GtkEntryPrivate *priv;
+ GObject *obj;
+
+ g_return_if_fail (GTK_IS_ENTRY (entry));
+ priv = GTK_ENTRY_GET_PRIVATE (entry);
+
+ if (buffer)
+ {
+ g_return_if_fail (GTK_IS_ENTRY_BUFFER (buffer));
+ g_object_ref (buffer);
+ }
+
+ if (priv->buffer)
+ {
+ buffer_disconnect_signals (entry);
+ g_object_unref (priv->buffer);
+
+ /* COMPAT: Deprecated. Not used. Setting these fields no longer necessary in GTK 3.x */
+ entry->text = NULL;
+ entry->text_length = 0;
+ entry->text_max_length = 0;
+ }
+
+ priv->buffer = buffer;
+
+ if (priv->buffer)
+ {
+ buffer_connect_signals (entry);
+
+ /* COMPAT: Deprecated. Not used. Setting these fields no longer necessary in GTK 3.x */
+ entry->text = (char*)gtk_entry_buffer_get_text (priv->buffer);
+ entry->text_length = gtk_entry_buffer_get_length (priv->buffer);
+ entry->text_max_length = gtk_entry_buffer_get_max_length (priv->buffer);
+ }
+
+ obj = G_OBJECT (entry);
+ g_object_freeze_notify (obj);
+ g_object_notify (obj, "buffer");
+ g_object_notify (obj, "text");
+ g_object_notify (obj, "text-length");
+ g_object_notify (obj, "max-length");
+ g_object_notify (obj, "visibility");
+ g_object_notify (obj, "invisible-char");
+ g_object_notify (obj, "invisible-char-set");
+ g_object_thaw_notify (obj);
+}
+
+
/**
* gtk_entry_set_text:
* @entry: a #GtkEntry
*
* Sets the text in the widget to the given
* value, replacing the current contents.
+ *
+ * See gtk_entry_buffer_set_text().
*/
void
gtk_entry_set_text (GtkEntry *entry,
const gchar *text)
{
- gint tmp_pos;
GtkEntryCompletion *completion;
+ GtkEntryPrivate *priv;
g_return_if_fail (GTK_IS_ENTRY (entry));
g_return_if_fail (text != NULL);
+ priv = GTK_ENTRY_GET_PRIVATE (entry);
/* Actually setting the text will affect the cursor and selection;
* if the contents don't actually change, this will look odd to the user.
*/
- if (strcmp (entry->text, text) == 0)
+ if (strcmp (gtk_entry_buffer_get_text (priv->buffer), text) == 0)
return;
completion = gtk_entry_get_completion (entry);
begin_change (entry);
g_object_freeze_notify (G_OBJECT (entry));
- gtk_editable_delete_text (GTK_EDITABLE (entry), 0, -1);
-
- tmp_pos = 0;
- gtk_editable_insert_text (GTK_EDITABLE (entry), text, strlen (text), &tmp_pos);
+ gtk_entry_buffer_set_text (priv->buffer, text, -1);
g_object_thaw_notify (G_OBJECT (entry));
end_change (entry);
gtk_entry_append_text (GtkEntry *entry,
const gchar *text)
{
+ GtkEntryPrivate *priv;
gint tmp_pos;
g_return_if_fail (GTK_IS_ENTRY (entry));
g_return_if_fail (text != NULL);
+ priv = GTK_ENTRY_GET_PRIVATE (entry);
- tmp_pos = entry->text_length;
+ tmp_pos = gtk_entry_buffer_get_length (priv->buffer);
gtk_editable_insert_text (GTK_EDITABLE (entry), text, -1, &tmp_pos);
}
* Retrieves the contents of the entry widget.
* See also gtk_editable_get_chars().
*
+ * This is equivalent to:
+ *
+ * <informalexample><programlisting>
+ * gtk_entry_buffer_get_text (gtk_entry_get_buffer (entry));
+ * </programlisting></informalexample>
+ *
* Return value: a pointer to the contents of the widget as a
* string. This string points to internally allocated
* storage in the widget and must not be freed, modified or
gtk_entry_get_text (GtkEntry *entry)
{
g_return_val_if_fail (GTK_IS_ENTRY (entry), NULL);
-
- return entry->text;
+ return gtk_entry_buffer_get_text (GTK_ENTRY_GET_PRIVATE (entry)->buffer);
}
/**
* Sets the maximum allowed length of the contents of the widget. If
* the current contents are longer than the given length, then they
* will be truncated to fit.
+ *
+ * This is equivalent to:
+ *
+ * <informalexample><programlisting>
+ * gtk_entry_buffer_set_max_length (gtk_entry_get_buffer (entry), max);
+ * </programlisting></informalexample>
**/
void
gtk_entry_set_max_length (GtkEntry *entry,
gint max)
{
g_return_if_fail (GTK_IS_ENTRY (entry));
-
- max = CLAMP (max, 0, MAX_SIZE);
-
- if (max > 0 && entry->text_length > max)
- gtk_editable_delete_text (GTK_EDITABLE (entry), max, -1);
-
- entry->text_max_length = max;
- g_object_notify (G_OBJECT (entry), "max-length");
+ gtk_entry_buffer_set_max_length (GTK_ENTRY_GET_PRIVATE (entry)->buffer, max);
}
/**
* Retrieves the maximum allowed length of the text in
* @entry. See gtk_entry_set_max_length().
*
+ * This is equivalent to:
+ *
+ * <informalexample><programlisting>
+ * gtk_entry_buffer_get_max_length (gtk_entry_get_buffer (entry));
+ * </programlisting></informalexample>
+ *
* Return value: the maximum allowed number of characters
* in #GtkEntry, or 0 if there is no maximum.
**/
gtk_entry_get_max_length (GtkEntry *entry)
{
g_return_val_if_fail (GTK_IS_ENTRY (entry), 0);
-
- return entry->text_max_length;
+ return gtk_entry_buffer_get_max_length (GTK_ENTRY_GET_PRIVATE (entry)->buffer);
}
/**
* Retrieves the current length of the text in
* @entry.
*
+ * This is equivalent to:
+ *
+ * <informalexample><programlisting>
+ * gtk_entry_buffer_get_length (gtk_entry_get_buffer (entry));
+ * </programlisting></informalexample>
+ *
* Return value: the current number of characters
* in #GtkEntry, or 0 if there are none.
*
gtk_entry_get_text_length (GtkEntry *entry)
{
g_return_val_if_fail (GTK_IS_ENTRY (entry), 0);
-
- return entry->text_length;
+ return gtk_entry_buffer_get_length (GTK_ENTRY_GET_PRIVATE (entry)->buffer);
}
/**
if (GTK_WIDGET_REALIZED (entry))
{
+ DisplayMode mode;
gboolean clipboard_contains_text;
GtkWidget *menuitem;
GtkWidget *submenu;
GTK_WIDGET (entry),
popup_menu_detach);
+ mode = gtk_entry_get_display_mode (entry);
append_action_signal (entry, entry->popup_menu, GTK_STOCK_CUT, "cut-clipboard",
- entry->editable && entry->visible && entry->current_pos != entry->selection_bound);
+ entry->editable && mode == DISPLAY_NORMAL &&
+ entry->current_pos != entry->selection_bound);
+
append_action_signal (entry, entry->popup_menu, GTK_STOCK_COPY, "copy-clipboard",
- entry->visible && entry->current_pos != entry->selection_bound);
+ mode == DISPLAY_NORMAL &&
+ entry->current_pos != entry->selection_bound);
+
append_action_signal (entry, entry->popup_menu, GTK_STOCK_PASTE, "paste-clipboard",
entry->editable && clipboard_contains_text);
-
+
menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_DELETE, NULL);
gtk_widget_set_sensitive (menuitem, entry->editable && entry->current_pos != entry->selection_bound);
g_signal_connect_swapped (menuitem, "activate",
if (gtk_editable_get_selection_bounds (editable, &sel_start, &sel_end))
{
- gchar *str = gtk_entry_get_public_chars (GTK_ENTRY (widget), sel_start, sel_end);
+ gchar *str = gtk_entry_get_display_text (GTK_ENTRY (widget), sel_start, sel_end);
gtk_selection_data_set_text (selection_data, str, -1);
if (completion->priv->has_completion)
gtk_editable_set_position (GTK_EDITABLE (entry),
- entry->text_length);
+ gtk_entry_buffer_get_length (GTK_ENTRY_GET_PRIVATE (entry)->buffer));
return FALSE;
}
GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
char *text = NULL;
- if (!entry->visible && priv->caps_lock_warning)
+ if (gtk_entry_get_display_mode (entry) != DISPLAY_NORMAL && priv->caps_lock_warning)
{
if (gdk_keymap_get_caps_lock_state (keymap))
text = _("Caps Lock is on");
--- /dev/null
+/* gtkentrybuffer.c
+ * Copyright (C) 2009 Stefan Walter <stef@memberwebs.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include "config.h"
+
+#include "gtkentrybuffer.h"
+#include "gtkintl.h"
+#include "gtkmarshalers.h"
+#include "gtkprivate.h"
+#include "gtkwidget.h"
+
+#include <gdk/gdk.h>
+
+#include <string.h>
+
+/**
+ * SECTION:gtkentrybuffer
+ * @title: GtkEntryBuffer
+ * @short_description: Text buffer for GtkEntry
+ *
+ * The #GtkEntryBuffer class contains the actual text displayed in a
+ * #GtkEntry widget.
+ *
+ * A single #GtkEntryBuffer object can be shared by multiple #GtkEntry
+ * widgets which will then share the same text content, but not the cursor
+ * position, visibility attributes, icon etc.
+ *
+ * #GtkEntryBuffer may be derived from. Such a derived class might allow
+ * text to be stored in an alternate location, such as non-pageable memory,
+ * useful in the case of important passwords. Or a derived class could
+ * integrate with an application's concept of undo/redo.
+ *
+ * Since: 2.18
+ */
+
+/* Initial size of buffer, in bytes */
+#define MIN_SIZE 16
+
+enum {
+ PROP_0,
+ PROP_TEXT,
+ PROP_LENGTH,
+ PROP_MAX_LENGTH,
+};
+
+enum {
+ INSERTED_TEXT,
+ DELETED_TEXT,
+ LAST_SIGNAL
+};
+
+static guint signals[LAST_SIGNAL] = { 0 };
+
+struct _GtkEntryBufferPrivate
+{
+ guint max_length;
+
+ /* Only valid if this class is not derived */
+ gchar *normal_text;
+ gsize normal_text_size;
+ gsize normal_text_bytes;
+ guint normal_text_chars;
+};
+
+G_DEFINE_TYPE (GtkEntryBuffer, gtk_entry_buffer, G_TYPE_OBJECT);
+
+/* --------------------------------------------------------------------------------
+ * DEFAULT IMPLEMENTATIONS OF TEXT BUFFER
+ *
+ * These may be overridden by a derived class, behavior may be changed etc...
+ * The normal_text and normal_text_xxxx fields may not be valid when
+ * this class is derived from.
+ */
+
+/* Overwrite a memory that might contain sensitive information. */
+static void
+trash_area (gchar *area,
+ gsize len)
+{
+ volatile gchar *varea = (volatile gchar *)area;
+ while (len-- > 0)
+ *varea++ = 0;
+}
+
+static const gchar*
+gtk_entry_buffer_normal_get_text (GtkEntryBuffer *buffer,
+ gsize *n_bytes)
+{
+ if (n_bytes)
+ *n_bytes = buffer->priv->normal_text_bytes;
+ if (!buffer->priv->normal_text)
+ return "";
+ return buffer->priv->normal_text;
+}
+
+static guint
+gtk_entry_buffer_normal_get_length (GtkEntryBuffer *buffer)
+{
+ return buffer->priv->normal_text_chars;
+}
+
+static guint
+gtk_entry_buffer_normal_insert_text (GtkEntryBuffer *buffer,
+ guint position,
+ const gchar *chars,
+ guint n_chars)
+{
+ GtkEntryBufferPrivate *pv = buffer->priv;
+ gsize prev_size;
+ gsize n_bytes;
+ gsize at;
+
+ n_bytes = g_utf8_offset_to_pointer (chars, n_chars) - chars;
+
+ /* Need more memory */
+ if (n_bytes + pv->normal_text_bytes + 1 > pv->normal_text_size)
+ {
+ prev_size = pv->normal_text_size;
+
+ /* Calculate our new buffer size */
+ while (n_bytes + pv->normal_text_bytes + 1 > pv->normal_text_size)
+ {
+ if (pv->normal_text_size == 0)
+ pv->normal_text_size = MIN_SIZE;
+ else
+ {
+ if (2 * pv->normal_text_size < GTK_ENTRY_BUFFER_MAX_SIZE)
+ pv->normal_text_size *= 2;
+ else
+ {
+ pv->normal_text_size = GTK_ENTRY_BUFFER_MAX_SIZE;
+ if (n_bytes > pv->normal_text_size - pv->normal_text_bytes - 1)
+ {
+ n_bytes = pv->normal_text_size - pv->normal_text_bytes - 1;
+ n_bytes = g_utf8_find_prev_char (chars, chars + n_bytes + 1) - chars;
+ n_chars = g_utf8_strlen (chars, n_bytes);
+ }
+ break;
+ }
+ }
+ }
+
+ /* Could be a password, so can't leave stuff in memory. */
+ gchar *et_new = g_malloc (pv->normal_text_size);
+ memcpy (et_new, pv->normal_text, MIN (prev_size, pv->normal_text_size));
+ trash_area (pv->normal_text, prev_size);
+ g_free (pv->normal_text);
+ pv->normal_text = et_new;
+ }
+
+ /* Actual text insertion */
+ at = g_utf8_offset_to_pointer (pv->normal_text, position) - pv->normal_text;
+ g_memmove (pv->normal_text + at + n_bytes, pv->normal_text + at, pv->normal_text_bytes - at);
+ memcpy (pv->normal_text + at, chars, n_bytes);
+
+ /* Book keeping */
+ pv->normal_text_bytes += n_bytes;
+ pv->normal_text_chars += n_chars;
+ pv->normal_text[pv->normal_text_bytes] = '\0';
+
+ gtk_entry_buffer_emit_inserted_text (buffer, position, chars, n_chars);
+ return n_chars;
+}
+
+static guint
+gtk_entry_buffer_normal_delete_text (GtkEntryBuffer *buffer,
+ guint position,
+ guint n_chars)
+{
+ GtkEntryBufferPrivate *pv = buffer->priv;
+ gsize start, end;
+
+ if (position > pv->normal_text_chars)
+ position = pv->normal_text_chars;
+ if (position + n_chars > pv->normal_text_chars)
+ n_chars = pv->normal_text_chars - position;
+
+ if (n_chars > 0)
+ {
+ start = g_utf8_offset_to_pointer (pv->normal_text, position) - pv->normal_text;
+ end = g_utf8_offset_to_pointer (pv->normal_text, position + n_chars) - pv->normal_text;
+
+ g_memmove (pv->normal_text + start, pv->normal_text + end, pv->normal_text_bytes + 1 - end);
+ pv->normal_text_chars -= n_chars;
+ pv->normal_text_bytes -= (end - start);
+
+ /*
+ * Could be a password, make sure we don't leave anything sensitive after
+ * the terminating zero. Note, that the terminating zero already trashed
+ * one byte.
+ */
+ trash_area (pv->normal_text + pv->normal_text_bytes + 1, end - start - 1);
+
+ gtk_entry_buffer_emit_deleted_text (buffer, position, n_chars);
+ }
+
+ return n_chars;
+}
+
+/* --------------------------------------------------------------------------------
+ *
+ */
+
+static void
+gtk_entry_buffer_real_inserted_text (GtkEntryBuffer *buffer,
+ guint position,
+ const gchar *chars,
+ guint n_chars)
+{
+ g_object_notify (G_OBJECT (buffer), "text");
+ g_object_notify (G_OBJECT (buffer), "length");
+}
+
+static void
+gtk_entry_buffer_real_deleted_text (GtkEntryBuffer *buffer,
+ guint position,
+ guint n_chars)
+{
+ g_object_notify (G_OBJECT (buffer), "text");
+ g_object_notify (G_OBJECT (buffer), "length");
+}
+
+/* --------------------------------------------------------------------------------
+ *
+ */
+
+static void
+gtk_entry_buffer_init (GtkEntryBuffer *buffer)
+{
+ GtkEntryBufferPrivate *pv;
+
+ pv = buffer->priv = G_TYPE_INSTANCE_GET_PRIVATE (buffer, GTK_TYPE_ENTRY_BUFFER, GtkEntryBufferPrivate);
+
+ pv->normal_text = NULL;
+ pv->normal_text_chars = 0;
+ pv->normal_text_bytes = 0;
+ pv->normal_text_size = 0;
+}
+
+static void
+gtk_entry_buffer_finalize (GObject *obj)
+{
+ GtkEntryBuffer *buffer = GTK_ENTRY_BUFFER (obj);
+ GtkEntryBufferPrivate *pv = buffer->priv;
+
+ if (pv->normal_text)
+ {
+ trash_area (pv->normal_text, pv->normal_text_size);
+ g_free (pv->normal_text);
+ pv->normal_text = NULL;
+ pv->normal_text_bytes = pv->normal_text_size = 0;
+ pv->normal_text_chars = 0;
+ }
+
+ G_OBJECT_CLASS (gtk_entry_buffer_parent_class)->finalize (obj);
+}
+
+static void
+gtk_entry_buffer_set_property (GObject *obj,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ GtkEntryBuffer *buffer = GTK_ENTRY_BUFFER (obj);
+
+ switch (prop_id)
+ {
+ case PROP_TEXT:
+ gtk_entry_buffer_set_text (buffer, g_value_get_string (value), -1);
+ break;
+ case PROP_MAX_LENGTH:
+ gtk_entry_buffer_set_max_length (buffer, g_value_get_uint (value));
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec);
+ break;
+ }
+}
+
+static void
+gtk_entry_buffer_get_property (GObject *obj,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ GtkEntryBuffer *buffer = GTK_ENTRY_BUFFER (obj);
+
+ switch (prop_id)
+ {
+ case PROP_TEXT:
+ g_value_set_string (value, gtk_entry_buffer_get_text (buffer));
+ break;
+ case PROP_LENGTH:
+ g_value_set_uint (value, gtk_entry_buffer_get_length (buffer));
+ break;
+ case PROP_MAX_LENGTH:
+ g_value_set_uint (value, gtk_entry_buffer_get_max_length (buffer));
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec);
+ break;
+ }
+}
+
+static void
+gtk_entry_buffer_class_init (GtkEntryBufferClass *klass)
+{
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+ gobject_class->finalize = gtk_entry_buffer_finalize;
+ gobject_class->set_property = gtk_entry_buffer_set_property;
+ gobject_class->get_property = gtk_entry_buffer_get_property;
+
+ klass->get_text = gtk_entry_buffer_normal_get_text;
+ klass->get_length = gtk_entry_buffer_normal_get_length;
+ klass->insert_text = gtk_entry_buffer_normal_insert_text;
+ klass->delete_text = gtk_entry_buffer_normal_delete_text;
+
+ klass->inserted_text = gtk_entry_buffer_real_inserted_text;
+ klass->deleted_text = gtk_entry_buffer_real_deleted_text;
+
+ g_type_class_add_private (gobject_class, sizeof (GtkEntryBufferPrivate));
+
+ /**
+ * GtkEntryBuffer:text:
+ *
+ * The contents of the buffer.
+ *
+ * Since: 2.18
+ */
+ g_object_class_install_property (gobject_class, PROP_TEXT,
+ g_param_spec_string ("text", P_("Text"),
+ P_("The contents of the buffer"),
+ "", GTK_PARAM_READWRITE));
+
+ /**
+ * GtkEntryBuffer:length:
+ *
+ * The length (in characters) of the text in buffer.
+ *
+ * Since: 2.18
+ */
+ g_object_class_install_property (gobject_class, PROP_LENGTH,
+ g_param_spec_uint ("length", P_("Text length"),
+ P_("Length of the text currently in the buffer"),
+ 0, GTK_ENTRY_BUFFER_MAX_SIZE, 0, GTK_PARAM_READABLE));
+
+ /**
+ * GtkEntryBuffer:max-length:
+ *
+ * The maximum length (in characters) of the text in the buffer.
+ *
+ * Since: 2.18
+ */
+ g_object_class_install_property (gobject_class, PROP_MAX_LENGTH,
+ g_param_spec_uint ("max-length", P_("Maximum length"),
+ P_("Maximum number of characters for this entry. Zero if no maximum"),
+ 0, GTK_ENTRY_BUFFER_MAX_SIZE, 0, GTK_PARAM_READWRITE));
+
+ /**
+ * GtkEntry::inserted-text:
+ * @buffer: a #GtkEntryBuffer
+ * @position: the position the text was inserted at.
+ * @chars: The text that was inserted.
+ * @n_chars: The number of characters that were inserted.
+ *
+ * This signal is emitted after text is inserted into the buffer.
+ *
+ * Since: 2.18
+ */
+ signals[INSERTED_TEXT] = g_signal_new (I_("inserted-text"),
+ GTK_TYPE_ENTRY_BUFFER,
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (GtkEntryBufferClass, inserted_text),
+ NULL, NULL,
+ _gtk_marshal_VOID__UINT_STRING_UINT,
+ G_TYPE_NONE, 3,
+ G_TYPE_UINT,
+ G_TYPE_STRING,
+ G_TYPE_UINT);
+
+ /**
+ * GtkEntry::deleted-text:
+ * @buffer: a #GtkEntryBuffer
+ * @position: the position the text was deleted at.
+ * @n_chars: The number of characters that were deleted.
+ *
+ * This signal is emitted after text is deleted from the buffer.
+ *
+ * Since: 2.18
+ */
+ signals[DELETED_TEXT] = g_signal_new (I_("deleted-text"),
+ GTK_TYPE_ENTRY_BUFFER,
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (GtkEntryBufferClass, deleted_text),
+ NULL, NULL,
+ _gtk_marshal_VOID__UINT_UINT,
+ G_TYPE_NONE, 2,
+ G_TYPE_UINT,
+ G_TYPE_UINT);
+}
+
+/* --------------------------------------------------------------------------------
+ *
+ */
+
+/**
+ * gtk_entry_buffer_new:
+ * @initial_chars: initial buffer text, or %NULL
+ * @n_initial_chars: number of characters in @initial_chars, or -1
+ *
+ * Create a new GtkEntryBuffer object.
+ *
+ * Optionally, specify initial text to set in the buffer.
+ *
+ * Return value: A new GtkEntryBuffer object.
+ *
+ * Since: 2.18
+ **/
+GtkEntryBuffer*
+gtk_entry_buffer_new (const gchar *initial_chars,
+ gint n_initial_chars)
+{
+ GtkEntryBuffer *buffer = g_object_new (GTK_TYPE_ENTRY_BUFFER, NULL);
+ if (initial_chars)
+ gtk_entry_buffer_set_text (buffer, initial_chars, n_initial_chars);
+ return buffer;
+}
+
+/**
+ * gtk_entry_buffer_get_length:
+ * @buffer: a #GtkEntryBuffer
+ *
+ * Retrieves the length in characters of the buffer.
+ *
+ * Return value: The number of characters in the buffer.
+ *
+ * Since: 2.18
+ **/
+guint
+gtk_entry_buffer_get_length (GtkEntryBuffer *buffer)
+{
+ GtkEntryBufferClass *klass;
+
+ g_return_val_if_fail (GTK_IS_ENTRY_BUFFER (buffer), 0);
+
+ klass = GTK_ENTRY_BUFFER_GET_CLASS (buffer);
+ g_return_val_if_fail (klass->get_length != NULL, 0);
+
+ return (*klass->get_length) (buffer);
+}
+
+/**
+ * gtk_entry_buffer_get_bytes:
+ * @buffer: a #GtkEntryBuffer
+ *
+ * Retrieves the length in bytes of the buffer.
+ * See gtk_entry_buffer_get_length().
+ *
+ * Return value: The byte length of the buffer.
+ *
+ * Since: 2.18
+ **/
+gsize
+gtk_entry_buffer_get_bytes (GtkEntryBuffer *buffer)
+{
+ GtkEntryBufferClass *klass;
+ gsize bytes = 0;
+
+ g_return_val_if_fail (GTK_IS_ENTRY_BUFFER (buffer), 0);
+
+ klass = GTK_ENTRY_BUFFER_GET_CLASS (buffer);
+ g_return_val_if_fail (klass->get_text != NULL, 0);
+
+ (*klass->get_text) (buffer, &bytes);
+ return bytes;
+}
+
+/**
+ * gtk_entry_buffer_get_text:
+ * @buffer: a #GtkEntryBuffer
+ *
+ * Retrieves the contents of the buffer.
+ *
+ * The memory pointer returned by this call will not change
+ * unless this object emits a signal, or is finalized.
+ *
+ * Return value: a pointer to the contents of the widget as a
+ * string. This string points to internally allocated
+ * storage in the buffer and must not be freed, modified or
+ * stored.
+ *
+ * Since: 2.18
+ **/
+const gchar*
+gtk_entry_buffer_get_text (GtkEntryBuffer *buffer)
+{
+ GtkEntryBufferClass *klass;
+
+ g_return_val_if_fail (GTK_IS_ENTRY_BUFFER (buffer), NULL);
+
+ klass = GTK_ENTRY_BUFFER_GET_CLASS (buffer);
+ g_return_val_if_fail (klass->get_text != NULL, NULL);
+
+ return (*klass->get_text) (buffer, NULL);
+}
+
+/**
+ * gtk_entry_buffer_set_text:
+ * @buffer: a #GtkEntryBuffer
+ * @chars: the new text
+ * @n_chars: the number of characters in @text, or -1
+ *
+ * Sets the text in the buffer.
+ *
+ * This is roughly equivalent to calling gtk_entry_buffer_delete_text()
+ * and gtk_entry_buffer_insert_text().
+ *
+ * Note that @n_chars is in characters, not in bytes.
+ *
+ * Since: 2.18
+ **/
+void
+gtk_entry_buffer_set_text (GtkEntryBuffer *buffer,
+ const gchar *chars,
+ gint n_chars)
+{
+ g_return_if_fail (GTK_IS_ENTRY_BUFFER (buffer));
+ g_return_if_fail (chars != NULL);
+
+ g_object_freeze_notify (G_OBJECT (buffer));
+ gtk_entry_buffer_delete_text (buffer, 0, -1);
+ gtk_entry_buffer_insert_text (buffer, 0, chars, n_chars);
+ g_object_thaw_notify (G_OBJECT (buffer));
+}
+
+/**
+ * gtk_entry_buffer_set_max_length:
+ * @buffer: a #GtkEntryBuffer
+ * @max_length: the maximum length of the entry buffer, or 0 for no maximum.
+ * (other than the maximum length of entries.) The value passed in will
+ * be clamped to the range 0-65536.
+ *
+ * Sets the maximum allowed length of the contents of the buffer. If
+ * the current contents are longer than the given length, then they
+ * will be truncated to fit.
+ *
+ * Since: 2.18
+ **/
+void
+gtk_entry_buffer_set_max_length (GtkEntryBuffer *buffer,
+ guint max_length)
+{
+ g_return_if_fail (GTK_IS_ENTRY_BUFFER (buffer));
+
+ if (max_length > GTK_ENTRY_BUFFER_MAX_SIZE)
+ max_length = GTK_ENTRY_BUFFER_MAX_SIZE;
+
+ if (max_length > 0 && gtk_entry_buffer_get_length (buffer) > max_length)
+ gtk_entry_buffer_delete_text (buffer, max_length, -1);
+
+ buffer->priv->max_length = max_length;
+ g_object_notify (G_OBJECT (buffer), "max-length");
+}
+
+/**
+ * gtk_entry_buffer_get_max_length:
+ * @buffer: a #GtkEntryBuffer
+ *
+ * Retrieves the maximum allowed length of the text in
+ * @buffer. See gtk_entry_buffer_set_max_length().
+ *
+ * Return value: the maximum allowed number of characters
+ * in #GtkEntryBuffer, or 0 if there is no maximum.
+ *
+ * Since: 2.18
+ **/
+guint
+gtk_entry_buffer_get_max_length (GtkEntryBuffer *buffer)
+{
+ g_return_val_if_fail (GTK_IS_ENTRY_BUFFER (buffer), 0);
+ return buffer->priv->max_length;
+}
+
+/**
+ * gtk_entry_buffer_insert_text:
+ * @buffer: a #GtkEntryBuffer
+ * @position: the position at which to insert text.
+ * @chars: the text to insert into the buffer.
+ * @n_chars: the length of the text in characters, or -1
+ *
+ * Inserts @n_chars characters of @chars into the contents of the
+ * buffer, at position @position.
+ *
+ * If @n_chars is negative, then characters from chars will be inserted
+ * until a null-terminator is found. If @position or @n_chars are out of
+ * bounds, or the maximum buffer text length is exceeded, then they are
+ * coerced to sane values.
+ *
+ * Note that the position and length are in characters, not in bytes.
+ *
+ * Returns: The number of characters actually inserted.
+ *
+ * Since: 2.18
+ */
+guint
+gtk_entry_buffer_insert_text (GtkEntryBuffer *buffer,
+ guint position,
+ const gchar *chars,
+ gint n_chars)
+{
+ GtkEntryBufferClass *klass;
+ GtkEntryBufferPrivate *pv;
+ guint length;
+
+ g_return_val_if_fail (GTK_IS_ENTRY_BUFFER (buffer), 0);
+
+ length = gtk_entry_buffer_get_length (buffer);
+ pv = buffer->priv;
+
+ if (n_chars < 0)
+ n_chars = g_utf8_strlen (chars, -1);
+
+ /* Bring position into bounds */
+ if (position > length)
+ position = length;
+
+ /* Make sure not entering too much data */
+ if (pv->max_length > 0)
+ {
+ if (length >= pv->max_length)
+ n_chars = 0;
+ else if (length + n_chars > pv->max_length)
+ n_chars -= (length + n_chars) - pv->max_length;
+ }
+
+ klass = GTK_ENTRY_BUFFER_GET_CLASS (buffer);
+ g_return_val_if_fail (klass->insert_text != NULL, 0);
+
+ return (*klass->insert_text) (buffer, position, chars, n_chars);
+}
+
+/**
+ * gtk_entry_buffer_delete_text:
+ * @buffer: a #GtkEntryBuffer
+ * @position: position at which to delete text
+ * @n_chars: number of characters to delete
+ *
+ * Deletes a sequence of characters from the buffer. @n_chars characters are
+ * deleted starting at @position. If @n_chars is negative, then all characters
+ * until the end of the text are deleted.
+ *
+ * If @position or @n_chars are out of bounds, then they are coerced to sane
+ * values.
+ *
+ * Note that the positions are specified in characters, not bytes.
+ *
+ * Returns: The number of characters deleted.
+ *
+ * Since: 2.18
+ */
+guint
+gtk_entry_buffer_delete_text (GtkEntryBuffer *buffer,
+ guint position,
+ gint n_chars)
+{
+ GtkEntryBufferClass *klass;
+ guint length;
+
+ g_return_val_if_fail (GTK_IS_ENTRY_BUFFER (buffer), 0);
+
+ length = gtk_entry_buffer_get_length (buffer);
+ if (n_chars < 0)
+ n_chars = length;
+ if (position > length)
+ position = length;
+ if (position + n_chars > length)
+ n_chars = length - position;
+
+ klass = GTK_ENTRY_BUFFER_GET_CLASS (buffer);
+ g_return_val_if_fail (klass->delete_text != NULL, 0);
+
+ return (*klass->delete_text) (buffer, position, n_chars);
+}
+
+/**
+ * gtk_entry_buffer_emit_inserted_text:
+ * @buffer: a #GtkEntryBuffer
+ * @position: position at which text was inserted
+ * @chars: text that was inserted
+ * @n_chars: number of characters inserted
+ *
+ * Used when subclassing #GtkEntryBuffer
+ *
+ * Since: 2.18
+ */
+void
+gtk_entry_buffer_emit_inserted_text (GtkEntryBuffer *buffer,
+ guint position,
+ const gchar *chars,
+ guint n_chars)
+{
+ g_return_if_fail (GTK_IS_ENTRY_BUFFER (buffer));
+ g_signal_emit (buffer, signals[INSERTED_TEXT], 0, position, chars, n_chars);
+}
+
+/**
+ * gtk_entry_buffer_emit_deleted_text:
+ * @buffer: a #GtkEntryBuffer
+ * @position: position at which text was deleted
+ * @n_chars: number of characters deleted
+ *
+ * Used when subclassing #GtkEntryBuffer
+ *
+ * Since: 2.18
+ */
+void
+gtk_entry_buffer_emit_deleted_text (GtkEntryBuffer *buffer,
+ guint position,
+ guint n_chars)
+{
+ g_return_if_fail (GTK_IS_ENTRY_BUFFER (buffer));
+ g_signal_emit (buffer, signals[DELETED_TEXT], 0, position, n_chars);
+}
+
projects / gtk4.git / commitdiff